Added borders to windows