Some tweaks done, however, it looks broken now..