implemented tab removal and many layout changes