Fixing overflow and text boxes