update interval picker, refactoring, layout improvements