Edited main layout, need integration to angular.

Please integrate to angular first.