Cleaner position tracking code + styles