Some cosmetic changes in the hope to help the CSS issue (not working but heh, this could help