adding and fixing stuff... (checkbox, add button...)