Add comments functionality, layout fixes