Changed some layout resources, committing for merge.
Fixed merge conflict with keaganr
Changes merged, pushing