Fix style for old SAs and reduce dependancies
Remove bottom margin and rename views