changed structure of page for a flexible approach