Remove unused variable
Add simple layout system