add more views and changed some style and layout