Fixed UI, modified JS