Fixed rendering bugs and did minor changes on the designs