Added some interface elements