Added propper structure for page