Solved some designing issues