updating branch restarting, stripping down to tab layout and merge with anthony