Refactors some of the code
Fixes placeholder elements and positions