Commit for rolling back. unstable
Looking more stable now
Added margins to layout manager