Basic modifications for a good layout so far.