Some more design changes, content added