Home style
Edge case
Refactored add stuff, positioning fixes