Fixed bugs with state in top navigation
Added expanded view