fix layout warning
cleanup header + fastrack