Layout Update

Layout tweaks and additions with placeholder for custom imageview
control.