Improve home Layout