Further optimizations and fixed the .container layout bug caused by including Bootstrap