base layout and index page gui improved
merge conflict solved