Toolbar resized + Bug Fixes