Redesign View; Bugfixing