Tab index and small tweaks