Added comments and text layout