Container div changes and fixes