Rework layout fix button & div issues