fixed alignement issues and borders