changed main layout, not done yet