I agree. It's becoming a strain the more I work on it. "Redesign" will be going into the backlog. :)