Fixed some layout issues in my markup