Three columns work and separating styles for redesign
Normal theme for the master branch
Weird merge things