reverting change made during phase 2 development: transparent borders
merged changes