fix allignment and some majorish issue i think