Cleaned uiframe fill
Cleaned & added border handling