Fixed some designing issues.