Cleaned up layout and fixed index page buttons