Added border objects; implemented proper visibility of border objects and displaying them; changed package structure