merged changes to ruby app layouts