merged changes with homepage