Layout refactored
Merge branches 'add-bills-summary' and 'development' into development