Deleted a lot of legacy code
Added v21 toolbar layout