Added borders and FPS mode