Layout cleanup. Add header-bar image