Small functionality and layout updates