Removed superfluous avatar class and replaced with layout and alignment objects