Layout improvements - modules
Merge

Conflicts:
	app/views/playlists/show.html.erb