refactoring and redesign. also fixed orientation for the lists page
fixed conflicts