Fixing layout and implementing MMS comments