Added rfaised border; fixed layout