Home layout--additional features
Merge origin/master