small fixes, consider grid re-do or re-theme